line 1
line master
line 3
line 3
<<<<<<< HEAD
line dev
=======
line 4
>>>>>>> master
